Autogenerated HTML docs for v1.6.0-rc1-90-gddd6
diff --git a/git-mergetool.html b/git-mergetool.html index 0c7b646..301e50b 100644 --- a/git-mergetool.html +++ b/git-mergetool.html
@@ -354,7 +354,7 @@ tool is available in PATH.</p></div> <div class="para"><p>Instead of running one of the known merge tool programs <em>git-mergetool</em> can be customized to run an alternative program -by specifying the command line to invoke in a configration +by specifying the command line to invoke in a configuration variable <tt>mergetool.<tool>.cmd</tt>.</p></div> <div class="para"><p>When <em>git-mergetool</em> is invoked with this tool (either through the <tt>-t</tt> or <tt>--tool</tt> option or the <tt>merge.tool</tt> configuration @@ -388,7 +388,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-06 05:16:54 UTC +Last updated 2008-08-06 06:19:09 UTC </div> </div> </body>
